Supply the current GError for fatal_error_handler(). (#441443)

2007-05-30  Chris Wilson  <chris@chris-wilson.co.uk>

    * io-jpeg.c (gdk_pixbuf__jpeg_image_stop_load):
    Supply the current GError for fatal_error_handler(). (#441443)

svn path=/trunk/; revision=17989

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 627fdb0a29a7b8a53f9ff2f925664bbf3444b2a6..fffad76d50a1a56f485cd4d63f1042a32016f6b2 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-30  Chris Wilson  <chris@chris-wilson.co.uk>
+
+       * io-jpeg.c (gdk_pixbuf__jpeg_image_stop_load):
+       Supply the current GError for fatal_error_handler(). (#441443)
+
 2007-05-24   Matthias Clasen  <mclasen@redhat.com>
 
        * === Released 2.11.0 ===

diff --git a/gdk-pixbuf/io-jpeg.c b/gdk-pixbuf/io-jpeg.c
index 6a1fde0b1e3bb37b0ca7c21d12ed14aea296341c..b88675c98f01f64bdadfc6be2423c9535ef0561d 100644 (file)
--- a/gdk-pixbuf/io-jpeg.c
+++ b/gdk-pixbuf/io-jpeg.c
@@ -692,6 +692,7 @@ gdk_pixbuf__jpeg_image_stop_load (gpointer data, GError **error)
                g_object_unref (context->pixbuf);
        
        /* if we have an error? */
+       context->jerr.error = error;
        if (sigsetjmp (context->jerr.setjmp_buffer, 1)) {
                 retval = FALSE;
        } else {